[automerger skipped] Merge "Update signature files to the new format" am: a6c3d576 am: 19229320
am: b2ffef0d -s ours
am skip reason: change_id I2172319e3d580eb4b1ffc43616e5595dba20f026 with SHA1 11f217c5 is in history
Change-Id: I85627d0e11e5b5816b60ff08219c544de2986467