Patch crrev/c/5450018 and crrev/c/5458753

This should eliminate all the remaining divergence that was made for the native test runner.

Test: atest cronet_unittests_tester
Bug: 334809455
Change-Id: I8b68df1ecb96a5b900ff631fa0eae61ff7b70605
10 files changed