* Fix running the test suite.
- Cherry-pick upstream fix in fix-bootstrap-test-1.diff and
fix-bootstrap-test-2.diff
* Fix running the test suite.
- Cherry-pick upstream fix in fix-bootstrap-test-1.diff and
fix-bootstrap-test-2.diff