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

Change-Id: I17a572fa28c1371ef51753ff236f569a018df063