Merge "test: Blacklist oatwriter layout test for no-dex2oat"
am: 8f6d83f69a

Change-Id: Ib0497947b98798e5a4ee3d8baf56f8d437f127c7