Merge "clang now supports -fdebug-prefix-map=."