Merge "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang.""