Merge "test: Blacklist oatwriter layout test for no-dex2oat"