Merge "Fix clang-tidy warnings in aapt and aapt2."