Android 7.1.1 release 3
Merge "Fix build with clang."