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

Change-Id: I2882c7415109a505c994187fc287ba903cf4ea7d