Android N Preview 5 (NPD90G)
Merge "Fix build with clang."