Android CTS 5.1 Release 22 (4181931)
Merge "Make ping use socket marks properly."