Merge "Export KeyFactory backed by Android Keystore." into mnc-dev