Merge "Merge "Special handling of priv-apps in Zygote." am: 46af70ca am: 79d4ef6c am: 836f2fe7 am: 0bd07225"