Merge "Revert "Revert "Turn on XOM for libc""" am: 58239d0020
am: 6ccff0a05e

Change-Id: I64b93e376278d388ce29f965cfba79d2f0a26614