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

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