am ceb21495: Merge "Fix libvpx clang build"

* commit 'ceb214959c6af1945c48599feb0e6b8e4e42c1e0':
  Fix libvpx clang build