Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev