Merge "Recognize new clang-tidy android-* warnings."