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

Change-Id: I0707618fa05ece6790761c91e7d0d6768c8cf221