Merge branch 'master' of git://android.git.kernel.org/platform/system/core into merge_korg_master

* 'master' of git://android.git.kernel.org/platform/system/core:
  adb: Use correct language ID when retrieving USB serial number.
  Fix typo in adb commandline help
  Fix bug where ECONNABORTED would have always occured on asocket_write.
  Helper to perform abortable blocking operations on a socket: