Merge "Revert "Make privileged apps always keep uncompressed dex files.""