Merge "LOCAL_CLANG := true is now the default"