Merge "Special handling of priv-apps in Zygote." am: 46af70cad9 am: 79d4ef6caa
am: 836f2fe701

Change-Id: Ieb8b53e69ac14be6e4e0e0210f12343e7e863b66