Merge "Record the path to adb used for the device"
am: b7cf899a10

Change-Id: I747f346a3ab5e8a6fdbce6fac3db5af7dc115ae0