Merge "Add art_defaults to dexlayout" am: 35fc819cd9 am: bb8db9c0db
am: 81a6485ddc

Change-Id: Id796ad7474c74bce4a219a950de81b54e17efebd