Merge "Update keymaster API to final signing spec"