am ab3233be: am 6aa75175: Merge "Create 32 bit and 64 bit versions of exes."

* commit 'ab3233befb8381bd1a15f81f3261fa81dd55f297':
  Create 32 bit and 64 bit versions of exes.
diff --git a/micro_bench/Android.mk b/micro_bench/Android.mk
index c5be5f7..df54070 100644
--- a/micro_bench/Android.mk
+++ b/micro_bench/Android.mk
@@ -7,6 +7,9 @@
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := micro_bench
 
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -19,4 +22,7 @@
 LOCAL_STATIC_LIBRARIES = libc libm
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
 include $(BUILD_EXECUTABLE)