diff --git a/libwvdrmengine/build_and_run_all_unit_tests.sh b/libwvdrmengine/build_and_run_all_unit_tests.sh
index 4f905c3f..2dc63bee 100755
--- a/libwvdrmengine/build_and_run_all_unit_tests.sh
+++ b/libwvdrmengine/build_and_run_all_unit_tests.sh
@@ -9,45 +9,37 @@ fi
 
 . $ANDROID_BUILD_TOP/build/envsetup.sh
 
-cd $ANDROID_BUILD_TOP/external/gtest/
-pwd
-mm
-
-cd $ANDROID_BUILD_TOP/external/boringssl
-pwd
-mm
-
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine
 pwd
-mm
+mm || mma
 
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/gmock
 pwd
-mm
-
-cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/cdm/test
-pwd
-mm
-
-cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediacrypto/test
-pwd
-mm
-
-cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediadrm/test
-pwd
-mm
-
-cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/oemcrypto/test
-pwd
-mm
+mm || mma
 
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/unit
 pwd
-mm
+mm || mma
+
+cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/cdm/test
+pwd
+mm || mma
+
+cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediacrypto/test
+pwd
+mm || mma
+
+cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/mediadrm/test
+pwd
+mm || mma
+
+cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/oemcrypto/test
+pwd
+mm || mma
 
 cd $ANDROID_BUILD_TOP/vendor/widevine/libwvdrmengine/test/java/src/com/widevine/test
 pwd
-mm WITH_DEXPREOPT=false
+mm WITH_DEXPREOPT=false || mma WITH_DEXPREOPT=false
 
 echo "waiting for device"
 adb root && adb wait-for-device remount
diff --git a/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf b/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf
index 850fa175..fa6de829 100644
Binary files a/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf and b/libwvdrmengine/docs/WidevineSecurityIntegrationGuideforCENCAndroidSupplement.pdf differ