Merge changes from topic "version-bump"

* changes:
  keystore2: cope with new curve25519 enum
  Bump keystore2 AIDL API version 1->2