Merge "Revert "Allow use of local CLANG to build runtime libs""