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

Change-Id: Ie9f53fbd629534f3bcf7f62b5ace3832d17a142e