* commit '6004004428a93a03657b513d62eeaab660db0896': Fix backwards compat problem with AAPT public attrs