Merge "ART: Remove zygote OTA code"
am: ef1a3209ab

Change-Id: I7f52590e1818b3deb8e188b7c4ad13e1d613c8f6