Merge "adb: Add ability to specify device path" into ics-aah