Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev