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