Android n preview 1
Merge "Fix build with clang."