Sync with latest bitcoinj version.