am a85afdb8: Merge "Add support for WITHOUT_CLANG"

* commit 'a85afdb83d4d9d0fb03024eee9937b0882dd81ad':
  Add support for WITHOUT_CLANG