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

Change-Id: I907dafcc53adf69e6c588d9b61c5d62bbec4813a