Merge "Fix adb.py."
am: ec4c454

* commit 'ec4c4548dd2c02242b965162372e7bb4c6d03345':
  Fix adb.py.

Change-Id: I0d8dc444a4f2238c081784a2c791afc2262f406e