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

Change-Id: If2a66d01b274ab82b0c8d2b37fc0030a67ad7b6f