Android CTS 5.1 Release 17 (3736405)
Merge "Make ping use socket marks properly."