Merge "Revert "Turn on XOM for libc""
am: b656d4a1da

Change-Id: Ic3b2330e295dcffd133fcb2aabe7898b3b665d76