This reverts commit e4a52cb5.

Reason for revert: No longer necessary after https://chromium-review.googlesource.com/c/chromium/src/+/1409558

Original change's description:
> Fix Android ASAN tests when is_component_build=false
> 
> Context in Chromium CL:
> https://chromium-review.googlesource.com/c/chromium/src/+/1405277/
> 
> This CL must be landed first.
> 
> BUG=chromium:916973
> R=​thakis,cwallez,fjhenigman,geofflang,jmadill,ynovikov
> 
> Change-Id: Icde4ec98c9031a262e0dfafa5cfe2a702c4c4e3e
> Reviewed-on: https://chromium-review.googlesource.com/c/1405908
> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

TBR=thakis@chromium.org,ynovikov@chromium.org,fjhenigman@google.com,geofflang@chromium.org,jmadill@chromium.org,cwallez@google.com,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: chromium:916973
Change-Id: Ie9609db8e5d5f71acdc22d839b94f3e843bfe3ca
Reviewed-on: https://chromium-review.googlesource.com/c/1410282Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>