Make Arabic script runs longer (for performance) - bug 6426451.

Change-Id: I38b145aed01968fe9895b3d629dc0ab48ccbff97
diff --git a/contrib/harfbuzz-unicode.c b/contrib/harfbuzz-unicode.c
index 432d5b0..29c14b3 100755
--- a/contrib/harfbuzz-unicode.c
+++ b/contrib/harfbuzz-unicode.c
@@ -78,6 +78,13 @@
 
 HB_Script
 code_point_to_script(uint32_t cp) {
+ /* BEGIN android-changed
+    For the purpose of aggregating script runs together, we treat space
+    as belonging to the same script as surrounding characters. This is a
+    performance optimization to keep the number of runs down. */
+  if (cp == ' ') return HB_Script_Inherited;
+  /* END android-changed */
+
   const void *vprop = bsearch((void *) (intptr_t) cp, script_properties,
                               script_properties_count,
                               sizeof(struct script_property),