Merge "adb: hopefully deflake test_adb.py."
am: 151499e47e

Change-Id: I38b0a7c693a3e4b6eabb092d15309539972d982e