diff --git a/.travis.yml b/.travis.yml
index 3c477322f..af67b2333 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 
     # Install required Android components.
     #- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
-    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,build-tools-19.1.0,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
+    - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.2,build-tools-21.1.1,build-tools-19.1.0,android-21,android-19,platform-tools,extra-android-support,extra-android-m2repository
 install: echo "Installation done"
 script:
     - ./gradlew assemble -S -q
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
index dccef45dc..c866dc22b 160000
--- a/extern/openpgp-api-lib
+++ b/extern/openpgp-api-lib
@@ -1 +1 @@
-Subproject commit dccef45dc1646d623c01dcde7a28711b2ac815e4
+Subproject commit c866dc22bcfa004ec2c46bc86c08694e76d1058d