Merge "adb: attempt to exec newer adb servers on Linux." am: eecd5cc532
am: e60f681f7c

Change-Id: I3a968b8e17e612fef7a30a031ca5664a2e6e5462