Merge "Enable execute-only memory layouts by default." am: 0b475181a6 am: 0922a6ccba
am: 37d91c22b1

Change-Id: I08e3005801c17fa6facd92072ba20d9b6a24619d
diff --git a/android/config.go b/android/config.go
index 925ca94..7c1278e 100644
--- a/android/config.go
+++ b/android/config.go
@@ -649,7 +649,7 @@
 
 func (c *config) EnableXOM() bool {
 	if c.productVariables.EnableXOM == nil {
-		return false
+		return true
 	} else {
 		return Bool(c.productVariables.EnableXOM)
 	}