Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev