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