Merge "Update test expections after network changes in kernel/libcore."