Merge "Pin make target bouncycastle-bcpkix to java_version 1.7."