Merge "releasetools: replace verity keyid"