The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/492ef1276bde542b494a57681d3ce0ea3a73ea80

commit 492ef1276bde542b494a57681d3ce0ea3a73ea80
Author: michaelbai <michaelbai@chromium.org>
Date: Tue Jul 19 04:10:29 2016

Revert "Add a GN assert preventing android templates in non-default toolchain"

This reverts commit 09d787e26cac78497700f700c31361099bf9071a.

BUG= 629371 

Review-Url: https://codereview.chromium.org/2162813002
Cr-Commit-Position: refs/heads/master@{#406210}

[modify] https://crrev.com/492ef1276bde542b494a57681d3ce0ea3a73ea80/build/config/android/config.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/83bcd862038586061feea4b390ac524ab0a9a358

commit 83bcd862038586061feea4b390ac524ab0a9a358
Author: agrieve <agrieve@chromium.org>
Date: Fri Jul 29 04:26:20 2016

Fail write_build_config.py if current_toolchain != default_toolchain

There are a few spots in the Android templates that assume appending
__build_config to a given target label will result in the label for a
write_build_config action. When toolchains exist in a label, appending
like this doesn't work. E.g.: :some_label(//toolchain)__build_config

Previously, we added a GN assert to enforce default toolchain, but that
was too strict, as it made it so no other targets that are defined in
the same BUILD.gn file could use a non-default toolchain.

This change make the error a build-time error rather than a gn gen
error.

BUG= 629371 

Review-Url: https://codereview.chromium.org/2161063003
Cr-Commit-Position: refs/heads/master@{#408576}

[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/build/android/gyp/write_build_config.py
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/build/config/android/internal_rules.gni
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/device/vr/BUILD.gn
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/media/capture/BUILD.gn
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/ui/base/BUILD.gn
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/ui/gfx/BUILD.gn
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/ui/gl/BUILD.gn
[modify] https://crrev.com/83bcd862038586061feea4b390ac524ab0a9a358/ui/shell_dialogs/BUILD.gn