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

* commit '19f9d54fec2659769748d72972b4bed6a033571a':
  Fix backwards compat problem with AAPT public attrs