Merge "adb: switch version back to 40."