Merge "Revert "Never strip and store dex files uncompressed when they are...
Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system."" am: 8e41cdb2
am: 0ba1a099
Change-Id: I73aa06dee49849e6f763848df425225084210d64