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

* commit '10633c96b55d13f05304b758b01be48035adece3':
  Fix Android Keystore key factories to obey JCA contract.