Merge "Don't embed the dex code in the oat file if dex is uncompressed." am: c8d91039 am: f677d205 am: 898fa489 Change-Id: Ifbd90dd4e73204cdcaf03be11f3104385988fd09