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

Change-Id: I57a6d78640777640443d033187cdf1e7eb3da180