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