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

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