Hmm, I misunderstood that Chrome binary built in chrome-pre-flight-branch builder will be used in android-pre-flight-branch builders but it looks not correct because chrome built there is for specific board (samus in this case) and binary package can't be used.

Release builders will build Chrome binaries, but (1) it is AFDO build and (2) it is available after chrome-pre-flight-branch commits uprev and then it is picked up by release builders so even AFDO build is not always available.

Maybe easiest way to resolve the issue is to sync and build Chrome in android-pre-flight-branch builders (but not commit Chrome uprev in them of course). Let me prepare this change.

Requesting merge in advance. I hope I can get the change in today.

Your change meets the bar and is auto-approved for M60. Please go ahead and merge the CL to branch 3112 manually. Please contact milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/2d797e034329303f8b7cacf5ccebcd67f387d6f2

commit 2d797e034329303f8b7cacf5ccebcd67f387d6f2
Author: Shuhei Takahashi <nya@chromium.org>
Date: Sat Jun 10 11:40:11 2017

chromeos_config: Sync and build Chrome in Android PFB.

android-pre-flight-branch builders don't have a binary package of
Chrome because neither chrome-pre-flight-branch builder nor
release builders build binary packages usable by it.

BUG= chromium:730313 
TEST=cbuildbot/run_tests

Change-Id: Ia5e01a9ad4889ebda7819fd2e62c3f10ba1335a8
Reviewed-on: https://chromium-review.googlesource.com/527773
Commit-Ready: Shuhei Takahashi <nya@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>

[modify] https://crrev.com/2d797e034329303f8b7cacf5ccebcd67f387d6f2/cbuildbot/config_dump.json
[modify] https://crrev.com/2d797e034329303f8b7cacf5ccebcd67f387d6f2/cbuildbot/chromeos_config.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/dc27aa009ea33913c590722b6febb2e8ffbae9a4

commit dc27aa009ea33913c590722b6febb2e8ffbae9a4
Author: Shuhei Takahashi <nya@chromium.org>
Date: Sat Jun 10 12:21:16 2017

chromeos_config: Sync and build Chrome in Android PFB.

android-pre-flight-branch builders don't have a binary package of
Chrome because neither chrome-pre-flight-branch builder nor
release builders build binary packages usable by it.

BUG= chromium:730313 
TEST=cbuildbot/run_tests

Change-Id: Ia5e01a9ad4889ebda7819fd2e62c3f10ba1335a8
Reviewed-on: https://chromium-review.googlesource.com/527773
Commit-Ready: Shuhei Takahashi <nya@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
(cherry picked from commit 2d797e034329303f8b7cacf5ccebcd67f387d6f2)
Reviewed-on: https://chromium-review.googlesource.com/530426
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/dc27aa009ea33913c590722b6febb2e8ffbae9a4/cbuildbot/config_dump.json
[modify] https://crrev.com/dc27aa009ea33913c590722b6febb2e8ffbae9a4/cbuildbot/chromeos_config.py

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/d1675988a92c8d1d403c4dce55b7d72a37cf34c8

commit d1675988a92c8d1d403c4dce55b7d72a37cf34c8
Author: Shuhei Takahashi <nya@chromium.org>
Date: Thu Jun 15 10:17:45 2017

chromeos_config: Do not update BINHOST in Android PFB.

Android PFB only needs to publish android-container ebuild uprev,
and BINHOST updates are not needed. Actually Chrome PFB publishes
BINHOST updates in parallel, which causes races and conflicts.

BUG= chromium:730313 
TEST=cbuiltbot/run_tests

Change-Id: Ibea6c880cd1390ab952b939e71fb1c018cd5b859
Reviewed-on: https://chromium-review.googlesource.com/530886
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/d1675988a92c8d1d403c4dce55b7d72a37cf34c8/cbuildbot/config_dump.json
[modify] https://crrev.com/d1675988a92c8d1d403c4dce55b7d72a37cf34c8/cbuildbot/chromeos_config.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/chromite/+/075627a71eab8691a486b67f02b7b8e28c63ca21

commit 075627a71eab8691a486b67f02b7b8e28c63ca21
Author: Shuhei Takahashi <nya@chromium.org>
Date: Thu Jun 15 10:20:49 2017

chromeos_config: Do not update BINHOST in Android PFB.

Android PFB only needs to publish android-container ebuild uprev,
and BINHOST updates are not needed. Actually Chrome PFB publishes
BINHOST updates in parallel, which causes races and conflicts.

BUG= chromium:730313 
TEST=cbuiltbot/run_tests

Change-Id: Ibea6c880cd1390ab952b939e71fb1c018cd5b859
Reviewed-on: https://chromium-review.googlesource.com/530886
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>
(cherry picked from commit d1675988a92c8d1d403c4dce55b7d72a37cf34c8)
Reviewed-on: https://chromium-review.googlesource.com/536681
Reviewed-by: Shuhei Takahashi <nya@chromium.org>

[modify] https://crrev.com/075627a71eab8691a486b67f02b7b8e28c63ca21/cbuildbot/config_dump.json
[modify] https://crrev.com/075627a71eab8691a486b67f02b7b8e28c63ca21/cbuildbot/chromeos_config.py

M60 PFB bots are back to green. Yay!

Let's cherry-pick to other release branches too.

59 is now stable and probably has one more respin. Don't think this is needed at this point

OK, then let's say it's done.