Merge "Give the option of having an existing adb."
am: 6595e53835

Change-Id: Ib88e1c38ce020d1315d79abca8f38f4272bd3154