Merge "Revert "Revert "Don't embed the dex code in the oat file if dex is uncompressed."""