This includes the commits from

  https://dart.googlesource.com/sdk.git/+log/6e015bd9cddb..9c6e76468ca4

as well as the changes from

  https://github.com/flutter/engine/pull/22149/files

which are needed due to dart-lang/sdk@23ee425de7533b