am 8c415cf3: am 2c378078: Merge "Export KeyFactory backed by Android Keystore." into mnc-dev

* commit '8c415cf32c46a24a2f71dd6b0ffe0b4e15705a4e':
  Export KeyFactory backed by Android Keystore.