am 50f192fa: Merge "Fix "adb devices -l"."

* commit '50f192fafa7af2929c663a37dc4dc56610c07b41':
  Fix "adb devices -l".