Merge "releasetools: Fix an issue with pubkey extraction."
am: ca2ffed06c

Change-Id: Ibd9014ec04e26e018fcb4602a42b204941af13b6