Parcelable versioning
Increase API_VERSION to 3
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain