Merge "Remove frameworks' reference to an obsolete Bouncycastle keystore file."