Merge "Add netLegacyApi22 tests to postsubmit"