Merge "Remove mistakenly exported android_* network functions" am: 8475ee9807
am: 57c7e0d0a7

* commit '57c7e0d0a75e6ec6ec60bd7943cb8f2e54da15f6':
  Remove mistakenly exported android_* network functions