Android CTS 5.1 Release 20 (3993894)
Merge "Make ping use socket marks properly."