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

Change-Id: I21e4726a7e76a4d595cd819d64b2fcc1aa2dfd6d