am 4fee77ff: am 53a33da9: Merge "Support more KeySpecs in Android Keystore...
am 4fee77ff: am 53a33da9: Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev
* commit '4fee77ff':
Support more KeySpecs in Android Keystore KeyFactory.