Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev