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

Change-Id: I911bcee4317a7854a1e694923f7f35415931e2a2