Android CTS 5.1 Release 27 (4581275)
Merge "Make ping use socket marks properly."