am b66e7485: am 23325440: am 50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os"

* commit 'b66e74857703ca88ba32ec1cefae292a5444d654':
  Reimplement LocalSocket methods using android.system.Os