AI 143369: am: CL 143219 am: CL 143020 Fix the build?
  Apparently the build machine's version of "make" is too old to
  have the $(or) function.  Use $(word) instead as a substitute
  without the benefit of short-circuiting.
  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143369
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index fd773c2..4418eb7 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -44,14 +44,14 @@
 # US has only EN and ES
 
 
-config := $(or \
-            $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan), \
-            $(if $(findstring it,$(PRODUCT_LOCALES)),us-euro), \
-            $(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro), \
-            $(if $(findstring cs,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring de,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring fr,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring nl,$(PRODUCT_LOCALES)),default), \
+config := $(word 1, \
+            $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan) \
+            $(if $(findstring it,$(PRODUCT_LOCALES)),us-euro) \
+            $(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro) \
+            $(if $(findstring cs,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring de,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring fr,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring nl,$(PRODUCT_LOCALES)),default) \
             us)
 
 icu_var_name := icudt38_dat