Merge "Wrap logcat invocations with timeout." into nyc-dev