Merge "Make privileged apps always keep uncompressed dex files." am: 3a5c65ef2f am: 65c8bc6695 am: 4ad5bbb35d
am: 55c81cea3e

Change-Id: Ifac7ac1a45fb7ad88b414005a345d7b1412acf37