Merge "Add art_defaults to dexlayout"