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

Change-Id: I7a119096e7bf5079c14893956ac22a9afa981508