Merge "Enable execute-only memory layouts by default."
am: 0b475181a6

Change-Id: I6b6b9ebc7f822bfb6a7630470ca4ae16affa90a1
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)
 	}