Support WITHOUT_CLANG builds

(cherry picked from commit c9f7723cdb39f9791775166ec1942e456086ad3c)

Change-Id: I9443e73a07b81038452c694a2f138faecdeff500
2 files changed