Add support for WITHOUT_CLANG

(cherry picked from commit 051a1740eb434e317451c09b72ae09c81cbfa1c1)

Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f