am 71ae73c0: am b4d0722d: am a9456438: Merge "Fix test_adb.py against production builds."

* commit '71ae73c01dd8ef12b69e25b5925cd85bc1bfd91d':
  Fix test_adb.py against production builds.