Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system."""