Snap for 4593582 from 144ce8bd09cc57d655d44c36670c59582374109f to pi-release

Change-Id: I2e445875226d4e3789419cc0501a9d0853f195cf
diff --git a/Android.bp b/Android.bp
index ff6b430..fd5ab7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,7 +105,7 @@
 
     export_include_dirs: ["src"],
     cflags: [
-        "-DHB_NO_MT",
+        "-DHAVE_INTEL_ATOMIC_PRIMITIVES",
         "-DHAVE_OT",
         "-DHAVE_ICU",
         "-DHAVE_ICU_BUILTIN",