Merge "adb: switch version back to 40." am: 9c27dde899 am: 7738fa3b97
am: 38b6b481f6

Change-Id: Ifcfd2c3023b22b5e7cd6ab4bbe508c233d5ab2de