diff -Nru android-platform-art-8.1.0+r23/debian/changelog android-platform-art-8.1.0+r23/debian/changelog
--- android-platform-art-8.1.0+r23/debian/changelog	2018-12-13 09:11:09.000000000 +0000
+++ android-platform-art-8.1.0+r23/debian/changelog	2019-03-19 01:31:47.000000000 +0000
@@ -1,3 +1,10 @@
+android-platform-art (8.1.0+r23-3+rpi1) buster-staging; urgency=medium
+
+  * Don't build andriod libs (but do build dmtracedump)  on armhf for raspbian,
+    they apparently contain assembler that is not armv6 compatible.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 19 Mar 2019 01:31:47 +0000
+
 android-platform-art (8.1.0+r23-3) unstable; urgency=medium
 
   * Put all LDFLAGS that link libraries at the end of the command line. This
diff -Nru android-platform-art-8.1.0+r23/debian/control android-platform-art-8.1.0+r23/debian/control
--- android-platform-art-8.1.0+r23/debian/control	2018-12-13 09:05:29.000000000 +0000
+++ android-platform-art-8.1.0+r23/debian/control	2019-03-19 01:31:47.000000000 +0000
@@ -4,28 +4,28 @@
 Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
 Uploaders: Kai-Chung Yan <seamlik@debian.org>
 Build-Depends:
- android-libbacktrace-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- android-libbase-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- android-libcutils-dev (>= 1:8.1.0+r23-3~) [amd64 i386 armel armhf arm64],
- android-libnativebridge-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- android-libnativeloader-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- android-libutils-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- android-libziparchive-dev (>= 1:8.1.0+r23) [amd64 i386 armel armhf arm64],
- clang [amd64 i386 armel armhf arm64],
+ android-libbacktrace-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ android-libbase-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ android-libcutils-dev (>= 1:8.1.0+r23-3~) [amd64 i386 armel arm64],
+ android-libnativebridge-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ android-libnativeloader-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ android-libutils-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ android-libziparchive-dev (>= 1:8.1.0+r23) [amd64 i386 armel arm64],
+ clang [amd64 i386 armel arm64],
  debhelper (>= 11~),
  dh-exec,
- libicu-dev [amd64 i386 armel armhf arm64],
- liblz4-dev [amd64 i386 armel armhf arm64],
- python3 [amd64 i386 armel armhf arm64],
- valgrind [amd64 i386 armel armhf arm64],
- zlib1g-dev [amd64 i386 armel armhf arm64]
+ libicu-dev [amd64 i386 armel arm64],
+ liblz4-dev [amd64 i386 armel arm64],
+ python3 [amd64 i386 armel arm64],
+ valgrind [amd64 i386 armel arm64],
+ zlib1g-dev [amd64 i386 armel arm64]
 Standards-Version: 4.2.1
 Homepage: https://android.googlesource.com/platform/art
 Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-art.git
 Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-art
 
 Package: dexdump
-Architecture: amd64 i386 armel armhf arm64
+Architecture: amd64 i386 armel arm64
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Displays information about Android DEX files
@@ -48,7 +48,7 @@
  using arrows.
 
 Package: android-libart
-Architecture: amd64 i386 armel armhf arm64
+Architecture: amd64 i386 armel arm64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Android Runtime
  Android Runtime (ART) is the managed runtime used by applications and some
@@ -61,7 +61,7 @@
  This library is only used by Android SDK and uses a customized RPATH.
 
 Package: dexlist
-Architecture: amd64 i386 armel armhf arm64
+Architecture: amd64 i386 armel arm64
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Lists all methods in all concrete classes in Android DEX files
diff -Nru android-platform-art-8.1.0+r23/debian/rules android-platform-art-8.1.0+r23/debian/rules
--- android-platform-art-8.1.0+r23/debian/rules	2018-12-13 09:07:13.000000000 +0000
+++ android-platform-art-8.1.0+r23/debian/rules	2019-03-19 01:31:36.000000000 +0000
@@ -19,7 +19,7 @@
 COMPONENTS_AOSP = debian/out/dexdump debian/out/dexlist
 
 # MIPS is left out because ART only supports MIPSr6 while Debian is by default MIPSr2
-ifeq ($(filter amd64 i386 armel armhf arm64,$(DEB_HOST_ARCH)),)
+ifeq ($(filter amd64 i386 armel arm64,$(DEB_HOST_ARCH)),)
   COMPONENTS += $(COMPONENTS_ANY)
 else
   COMPONENTS += $(COMPONENTS_ANY) $(COMPONENTS_AOSP)