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