am e25abed5: Fix and re-enable clang build.

* commit 'e25abed5ef1542dc435905e05597fe374382fbec':
  Fix and re-enable clang build.