Merge "Disable view compilation for privileged apps" am: 3c496729de
am: ff52af9cdd

Change-Id: I0ed2bcdd5b4618707a1586708e47abbfa1afff0e