Reland of Make secondary abi work for component build

Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855
Committed: https://crrev.com/06d80348f0e49fe7558ee8b3adad6f56078b5842
Cr-Commit-Position: refs/heads/master@{#417942}

[agrieve, 2016-09-12 14:02:25]

Created Reland of Make secondary abi work for component build

[agrieve, 2016-09-12 14:16:36]

Description was changed from

==========
Reland of Make secondary abi work for component build (patchset #1 id:1 of
https://codereview.chromium.org/2333593002/ )

Reason for revert:
For real this time.

Original issue's description:
> Revert of Make secondary abi work for component build (patchset #2 id:110001
of https://codereview.chromium.org/2326973003/ )
> 
> Reason for revert:
> Doesn't implement a guarded import as described. Leads to the same problems as
on first CL downstream:
>
https://build.chromium.org/p/tryserver.v8/builders/v8_android_arm_compile_rel...
> 
> Original issue's description:
> > Reland of Make secondary abi work for component build
> >
> > Reverted in:
> > https://codereview.chromium.org/2327063002/
> >
> > Reason for reland:
> > Now guards non-build import behind enable_java_templates
> >
> > TBR=michaelbai,machenbach
> > BUG=622855
> >
> > Committed: https://crrev.com/2ded0b9b26d3cfdd3068b36c28d157c87cb8ab39
> > Cr-Commit-Position: refs/heads/master@{#417597}
> 
> TBR=michaelbai@chromium.org,agrieve@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=622855
> 
> Committed: https://crrev.com/4ecdcbc6d42854e4a710f208d0a3875d75dafa90
> Cr-Commit-Position: refs/heads/master@{#417897}

TBR=michaelbai@chromium.org,machenbach@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=622855
==========

to

==========
Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855
==========

[agrieve, 2016-09-12 14:16:44]

The CQ bit was checked by agrieve@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-12 14:16:57]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[agrieve, 2016-09-12 14:18:23]

On 2016/09/12 14:02:25, agrieve wrote:
> Created Reland of Make secondary abi work for component build

Fixed it for real now (seariously... who put that there!?). And also added a
comment to help guard future cases. Still struggling to figure out a way we
could have a test for this in the main checkout though :S

[Michael Achenbach, 2016-09-12 14:29:12]

lgtm on the import-fix! thanks!

[commit-bot: I haz the power, 2016-09-12 15:19:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-12 15:19:41]

Dry run: This issue passed the CQ dry run.

[agrieve, 2016-09-12 15:22:13]

The CQ bit was checked by agrieve@chromium.org

[commit-bot: I haz the power, 2016-09-12 15:22:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 15:26:36]

Description was changed from

==========
Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855
==========

to

==========
Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855
==========

[commit-bot: I haz the power, 2016-09-12 15:26:37]

Committed patchset #2 (id:110001)

[commit-bot: I haz the power, 2016-09-12 15:28:11]

Description was changed from

==========
Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855
==========

to

==========
Reland #2 of Make secondary abi work for component build

Previously reverted in:
https://codereview.chromium.org/2333593002/

Reason for reland:
Removed offending import for real this time.

BUG=622855

Committed: https://crrev.com/06d80348f0e49fe7558ee8b3adad6f56078b5842
Cr-Commit-Position: refs/heads/master@{#417942}
==========

[commit-bot: I haz the power, 2016-09-12 15:28:12]

Patchset 2 (id:??) landed as
https://crrev.com/06d80348f0e49fe7558ee8b3adad6f56078b5842
Cr-Commit-Position: refs/heads/master@{#417942}