Merge "Update configure.ac/Makefile for clang"