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

* commit 'a945643831db4ec58988a0773a89f3858d282b07':
  Fix test_adb.py against production builds.