Merge "Remove unused macros gpg-sig and jjbini"