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

Change-Id: I5371f94c6b5adc626bdd5bc322b183dcb6ab40f3