This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to flutter-1.22-candidate.12. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

led build of mac ios engine with the correct recipe: https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/fujino_google.com/3de29676009abd851fd7bbedd68a2f237768d0156f62ec397c47c60dcb586d9d/+/annotations

@christopherfujino it was a wrong fix, pushed again.

I triggered another LED build https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/fujino_google.com/342a1f37debe81e0f1ee1bcf32c10620f08bb403abcf267ebe145f55cb3a6424/+/annotations, and I'm seeing a different failure, this time in "Scenario App Integration Tests". I will follow up tomorrow.

@christopherfujino The test didn't fail locally, It is possibly a flake. Could you trigger another build and check?

@christopherfujino The test didn't fail locally, It is possibly a flake. Could you trigger another build and check?

Will do. cc @blasten in case this is expected to fail.

re-run: https://luci-milo.appspot.com/raw/build/logs.chromium.org/flutter/led/fujino_google.com/e62b6a7574eea5ec97fc180050fd40770725b8fff9d91a90b1caafdd1761a694/+/annotations

Ok, it passed on a re-run.

has the same CI failures as the previous PR on branch #22930, thus I am merging this to fix the Linux Android AOT Engine build.

Mac Stable iOS Engine flaked post-submit, to fix, cherrypick https://github.com/flutter/engine/pull/22247/files