Merge "logcat: posixize and extend long arguments"