Merge "adb: restore adb/adb.exe in the list of artifacts."