Merge changes from topic 'dex2oat_dexlayout'
am: f215c5255c

Change-Id: I3fbaa07cff742d3a30d9690c20b0cef0ce704e8e