am 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123

* commit '22bfb75ebb949ff05d34ad22fbcc888582aaaaa4':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices