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

Change-Id: I4b7e01c600531ca2b87b1736671b042a5a4e53a0