Merge "Revert "Don't embed the dex code in the oat file if dex is uncompressed."" am: a6615945 am: 9061454f am: b9bc5c3d Change-Id: Id1573ecb06bb26964e62f823c1c2001d02351a52