am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit 'b05c2bebf85619aaedaa39593acc53eaaed22493':
  Move listen() over to using android.system.Os