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

Change-Id: Ieaceae41f836ff5f8f2f6f26ebeb95e5704254d1