This reverts a change in buildroot that caused regressions (see https://github.com/flutter/flutter/issues/23678).