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

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

Change-Id: I60a8d01fa2da411d1417d186bb93941ceed33418