This one includes the fix for the bug that caused the rollback in https://github.com/flutter/engine/pull/6621.