Merge "Add art_defaults to dexlayout"
am: 35fc819cd9

Change-Id: Iaa201535063cac651911a0cf9650ddd8592e2915