Android N Preview 3 (NPD35K)
Merge changes I9aff8b78,I75c2f919

* changes:
  Enable builds with Clang.
  Switch to a volatile store to a NULL pointer.