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

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