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

Change-Id: Ief324e68306ea953bbf1c2279b838e7a9cc436b4