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

Change-Id: I0c0fe46e74bfa4e3461454d62b14f98a4f71be96