Merge cherrypicks of ['googleplex-android-review.googlesource.com/23897842'] into security-aosp-udc-release.

Change-Id: I719ddbced2f514b070b2399d0b4796b08981fd27
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
index 382d629..aa676df 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
@@ -30,8 +30,9 @@
     ],
     static_libs: [
         "libpdfium-libopenjpeg2",
+        "libpdfium-fxcrt",
     ],
     include_dirs: [
-        "external/pdfium/third_party/libopenjpeg20",
+        "external/pdfium/third_party/libopenjpeg",
     ],
 }