Zygote: Fix race condition on package preloads.
am: a3d4230b92  -s ours

Change-Id: I6fc6b967f04a6f3cc87908b7fdba72e26a9fb025