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

Change-Id: I56433cae0f16bbabdb34f75f814192bd5dfb309c