Merge "Add unmodified scan-build/scan-view from trunk @189372 and @180715, respectively (darwin-x86)"