am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

* commit '863b1a90e0b52683d3ed82af54431d247be1cab1':
  Fix backwards compat problem with AAPT public attrs