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

Change-Id: I8db5d8cca9d18df827cc99669242ff5b94827a2f