Merge "Fix some style issues in adb_commandline()."