Merge changes I9aff8b78,I75c2f919 am: fb911ef am: 7d75aa8
am: f93d486

* commit 'f93d4864cddabf602f78069e35fdc7431536d26f':
  Enable builds with Clang.
  Switch to a volatile store to a NULL pointer.

Change-Id: Ie90458c523678a2967e7133017f9d41356acfbce