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

Change-Id: I52da1bd1e840886ad67a8f647ad49e97c649a26b