Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev