Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev am: 84e0f453d1
am: ac27936be5

Change-Id: I5ba16c4dc50fbf508830028a1bbac24e73b7ccb6