Merge "[adb] Add a version field to v4 signature format"