Merge "logd: logcat -L takes longer causing vold to timeout." into nyc-dev