Merge "Revert "Make privileged apps always keep uncompressed dex files."" am: bb779a0c04 am: ed7dab7625
am: 7c1b5d08d4

Change-Id: I6c71407f2504ccb8bde2ad121dc9574afe32c02d