Merge "Merge "tools/aapt: Fix typo" into main am: e19460ac30 am: 1d951eebb0" into main