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