Merge "Make wrap-logcat a bit easier to call."