Merge "Switch adb over to <chrono>." am: 59826ddee5 am: 2278b50f24 am: bd51a0d30d
am: ddf87aadb3

Change-Id: I22d67e091a865da71de83c28555795fb4ad89438