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

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