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

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