Merge "adb: bump the server version to 36."