diff -Nru android-platform-frameworks-base-8.1.0+r23/debian/android-libandroidfw-dev.install android-platform-frameworks-base-8.1.0+r23/debian/android-libandroidfw-dev.install
--- android-platform-frameworks-base-8.1.0+r23/debian/android-libandroidfw-dev.install	2018-07-16 09:40:32.000000000 +0000
+++ android-platform-frameworks-base-8.1.0+r23/debian/android-libandroidfw-dev.install	2018-10-12 06:08:31.000000000 +0000
@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 
-debian/out/libandroidfw.so	usr/lib/${DEB_HOST_MULTIARCH}/android
-libs/androidfw/include		usr/include/android
\ No newline at end of file
+debian/out/libandroidfw.so usr/lib/${DEB_HOST_MULTIARCH}/android
+libs/androidfw/include/*   usr/include/android
\ No newline at end of file
diff -Nru android-platform-frameworks-base-8.1.0+r23/debian/changelog android-platform-frameworks-base-8.1.0+r23/debian/changelog
--- android-platform-frameworks-base-8.1.0+r23/debian/changelog	2018-10-10 15:04:43.000000000 +0000
+++ android-platform-frameworks-base-8.1.0+r23/debian/changelog	2019-03-11 14:01:52.000000000 +0000
@@ -1,3 +1,23 @@
+android-platform-frameworks-base (1:8.1.0+r23-3~18.04) bionic; urgency=medium
+
+  * Backport for OpenJDK 11. LP: #1819448.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 11 Mar 2019 15:01:52 +0100
+
+android-platform-frameworks-base (1:8.1.0+r23-3build1) disco; urgency=medium
+
+  * No-change rebuild against latest protobuf
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 10 Nov 2018 14:59:56 -0500
+
+android-platform-frameworks-base (1:8.1.0+r23-3) unstable; urgency=medium
+
+  * Release to unstable
+  * Fix the install path of the headers of libandroidfw
+  * Annotate all packages with Multi-Arch (Closes: #895820)
+
+ -- Kai-Chung Yan <seamlikok@gmail.com>  Sun, 21 Oct 2018 18:38:43 +0800
+
 android-platform-frameworks-base (1:8.1.0+r23-2) experimental; urgency=medium
 
   * Properly declare target dependencies in d/rules, thus fixing a FTBFS when
diff -Nru android-platform-frameworks-base-8.1.0+r23/debian/control android-platform-frameworks-base-8.1.0+r23/debian/control
--- android-platform-frameworks-base-8.1.0+r23/debian/control	2018-10-09 06:59:36.000000000 +0000
+++ android-platform-frameworks-base-8.1.0+r23/debian/control	2018-10-21 10:37:13.000000000 +0000
@@ -29,6 +29,7 @@
 Package: android-libandroidfw
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Android utility library
  Library providing utility functions to Android related tools. This is needed
@@ -39,6 +40,7 @@
 Package: android-libandroidfw-dev
 Section: libdevel
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
+Multi-Arch: foreign
 Depends: android-libandroidfw (= ${binary:Version}),
          android-libutils-dev (>= 1:8.1.0+r23~),
          android-platform-frameworks-native-headers (>= 8.1.0+r23~),
@@ -55,6 +57,7 @@
 
 Package: aapt
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Android Asset Packaging Tool
  The Android Asset Packaging Tool (aapt) takes your application resource
@@ -66,6 +69,7 @@
 
 Package: android-libaapt
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Android Asset Packaging Tool - Shared library
  The Android Asset Packaging Tool (aapt) takes your application resource
@@ -79,6 +83,7 @@
 
 Package: split-select
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: APK split and selection tool
  Generates the logic for selecting a Split APK given some target Android device
@@ -91,6 +96,7 @@
 
 Package: android-framework-res
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Android platform framework resources
  This package provides the Android framework resources in an apk file,