Merge "adb: fail better in install-multiple." am: 91a531897a
am: 09529e67cb

Change-Id: I333057a7aae85d6cb86f4502dd96ef39d21b8fef