am a36f4d68: Merge "adb: bump server version to prevent feature mismatch."

* commit 'a36f4d680a02dbf2bf2166f148f4c5200ec1d8f4':
  adb: bump server version to prevent feature mismatch.