Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""