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

Change-Id: Ieeb35e8ade7ed7fb0a9e022ad6e799f990849080