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: 05ef66fc
am: 18d4ba62
Change-Id: Ibd6a208aaa80c8ab92b5ef35c3a93e3037e811a8