Bug 915201 - Don't depend on clang

Change-Id: I432e70695b48692d363b1a4b44b04b47004ad0f4