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