Merge "Add support for aapt:attr attributes"