Merge "ART: Remove zygote OTA code" into nyc-mr1-dev