Revert of mac: In static library builds, link against a static libc++.a (patchset #4 id:60001 of https://codereview.chromium.org/1413863003/ )

Reason for revert:
Failed lots of bots still :( Some in runhooks with:

Using overrides found in /Users/chrome-bot/.gyp/include.gypi
gyp: name 'asan' is not defined while evaluating condition '0==0 and component=="static_library" and asan==0' in /b/build/slave/Mac/build/src/third_party/pdfium/pdfium.gyp

http://build.chromium.org/p/chromium/buildstatus?builder=Mac&number=8563

Some with compile errors:

FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang -Wl,-search_paths_first ...
ld: library not found for -lc++

http://build.chromium.org/p/chromium.memory/buildstatus?builder=Mac%20ASan%2064%20Builder&number=27065

Original issue's description:
> mac: In static library builds, link against a static libc++.a
>
> To achieve this, just add a -Lthird_party/libc++-static flag to the link line,
> and add a postbuild that checks that Chromium Framework depends on neither
> libstdc++.dylib nor libc++.dylib Use the existing verify_order postbuild
> for this, and let it not run in component builds (since what it checks for
> isn't interesting in that config, and we do depend on system libc++ in
> component builds).
>
> This change is small but subtle, see thread
> "[chromium-dev] Intent to implement: Statically linking libc++ for Chrome/Mac"
> and the document linked from comment 14 on the bug for details.
>
> Ideally, this has no observable behavior change. If it looks like this
> breaks tests somewhere, especially on 10.6, please revert. (The bots
> like it, and the things I tried on 10.6 worked too, though.)
>
> BUG=400091
> R=mark@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/494270d01189f8b4b2b4ebd501fd980833489729
>
> Committed: https://chromium.googlesource.com/chromium/src/+/0f56cff872068cef226e7ad3f9701eb41d4eb2f5

TBR=mark@chromium.org,thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=400091

Review URL: https://codereview.chromium.org/1424593003

Cr-Commit-Position: refs/heads/master@{#355854}

2 files changed, 4 insertions, 4 deletions

diff --git a/third_party/libc++-static/build.sh b/third_party/libc++-static/build.sh
index d79054d..96d490c 100755
--- a/third_party/libc++-static/build.sh
+++ b/third_party/libc++-static/build.sh
@@ -38,16 +38,16 @@ sed -i '' 's/"default"/"hidden"/g' ../../libcxxabi/src/*
 sed -i '' 's/push(default)/push(hidden)/g' ../../libcxxabi/src/*
 
 # Let the default handler not depend on __cxa_demangle, this saves 0.5MB binary
-# size in each binary linking against libc++.a
+# size in each binary linking against libc++-static.a
 patch -d ../../libcxxabi -p0 < "${THIS_DIR}/libcxxabi.patch"
 
 "$CXX" -c -I../../libcxx/include/ -I../../libcxxabi/include ../../libcxxabi/src/*.cpp $FLAGS
 popd
 
-libtool -static -o libc++.a libcxx*/*.o
+libtool -static -o libc++-static.a libcxx*/*.o
 
-cp libc++.a "${THIS_DIR}/libc++.a"
-upload_to_google_storage.py -b chromium-libcpp "${THIS_DIR}/libc++.a"
+cp libc++-static.a "${THIS_DIR}"
+upload_to_google_storage.py -b chromium-libcpp "${THIS_DIR}/libc++-static.a"
 
 popd
 rm -rf "${DIR}"
diff --git a/third_party/libc++-static/libc++.a.sha1 b/third_party/libc++-static/libc++-static.a.sha1
index 06a3493..06a3493 100644
--- a/third_party/libc++-static/libc++.a.sha1
+++ b/third_party/libc++-static/libc++-static.a.sha1