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

Change-Id: Ia7d6e42a813e2277a60eb4def84c106e744aea11