Merge "adb: make test_device.py executable." am: db8b2afe23
am: e5c0b960cd

Change-Id: I0fcf98a929869547db9469ede2849d70f1902328