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

Change-Id: I370ccb892a3df564e6067007eae59eb789e21608