Merge "Update net/TEST_MAPPING to run more tests in presubmit."