Merge "Revert "Revert "Don't embed the dex code in the oat file if dex is uncompressed.""" am: b95eb37a am: 1bc3fc4d Change-Id: I8d44157cd02c8e62534ff703b53c9496a6ccf5a6