diff --git a/Android.build_host.mk b/Android.build_host.mk
index ee07d2d..77d11ba 100644
--- a/Android.build_host.mk
+++ b/Android.build_host.mk
@@ -23,8 +23,10 @@
   vg_local_arch := amd64
 endif
 
-# Do not call (builtin) memset from VG(memset).
-LOCAL_CLANG_CFLAGS += -fno-builtin-memset
+# TODO: This workaround is to avoid calling memset from VG(memset)
+# wrapper because of invalid clang optimization; This seems to be
+# limited to amd64/x86 codegen(?);
+LOCAL_CLANG := false
 
 LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux
 
diff --git a/Android.build_one.mk b/Android.build_one.mk
index 16ea662..cb5de07 100644
--- a/Android.build_one.mk
+++ b/Android.build_one.mk
@@ -23,15 +23,13 @@
 vg_local_arch  := $(vg_arch)
 endif
 
-# For arm and arm64 targets, clang compiled module has other
-# undefined errors, see bug 28454823.
+# TODO: This workaround is to avoid calling memset from VG(memset)
+# wrapper because of invalid clang optimization; This seems to be
+# limited to amd64/x86 codegen(?);
 ifeq ($(filter $TARGET_ARCH,x86 x86_64),)
   LOCAL_CLANG := false
 endif
 
-# Do not call (builtin) memset from VG(memset).
-LOCAL_CLANG_CFLAGS += -fno-builtin-memset
-
 LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux
 
 LOCAL_MODULE_TARGET_ARCH := $(vg_local_arch)