am 720beef2: Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev

* commit '720beef28dacc924d77576f63fced84e6a820dc6':
  AAPT: Move private attrs to new type for framework