Merge "Fix "adb devices -l"."