Merge \"logd: logcat -L takes longer causing vold to timeout.\" into nyc-dev
am: b02819e2af  -s ours

Change-Id: Id403d4ce398b7a9ecc604001469dc28d7d07b59e