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

Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25