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

Change-Id: I177d2ff4572919ca11771751e434166b816836a3