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

Change-Id: Id6368a47f7ae97e31f37f80b76286f3db5f073f4