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

* commit '81745c5164c3931ee3de184d2a0b463e0d5721af':
  AAPT: Continuation of public/private attribute fix