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