Merge "Fix clang-tidy performance warnings in aapt2."