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

Change-Id: I2cc666e0e12e160830746ebf2031f22fe041485e