Android 7.1.2 Release 6 (NHG47K)
Merge "Fix build with clang."