Try to use the correct identity with OpenPGP API's EXTRA_ACCOUNT_NAME
Fix building with ant