am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be...
am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev
automerge: 465d1234
* commit '465d1234':
AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices