Revert "Fixes necessary to enable in-tree libc++ on Android"

This reverts commit bdfa3bb74e76d0da628f876469af1d94bd5bad83.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=910864#c14

Original change's description:
> Fixes necessary to enable in-tree libc++ on Android
> 
> All that should be necessary after this change is to flip use_custom_libcxx to
> true on Android.
> 
> BUG=846855
> R=​thakis
> 
> Change-Id: I386176970ea7f05a9dbd7f04a2254c3a14d5419b
> Reviewed-on: https://chromium-review.googlesource.com/c/1377501
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#616799}

TBR=thakis@chromium.org,thomasanderson@chromium.org

Change-Id: I82ad36ccb2aadc760045644e208091dc4914f154
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 846855
Reviewed-on: https://chromium-review.googlesource.com/c/1378881
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616886}
2 files changed