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

Change-Id: I3be9c4eebb744bfd9b3912d8dae7f5c94e444e0e