Android 7.1.2 Release 1 (N2G47D)
Merge "Fix build with clang."