am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev

* commit '1aa4db0722f8b73472ec4a4f91626283bed665a7':
  AAPT: Continuation of public/private attribute fix