Merge "adb: bump the server version to 36." am: 3009b7c am: a0b5c62
am: e929e11

* commit 'e929e115bef6a7129bd18c33fb32c5f2eebdcf02':
  adb: bump the server version to 36.

Change-Id: Ided3bd4cafdd1893d38542563aabe904c740eb50