Android N Preview 2
Merge "Fix build with clang."