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

Change-Id: Iffa8b48032d5b7919e18324c77a2dbf7d6499ab6