Merge "Remove mistakenly exported android_* network functions"