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

* commit '8475ee9807103e0b49e8ca0c77530d66cde25ec0':
  Remove mistakenly exported android_* network functions