Merge "Turn off XOM on libnstest_root.so"
am: c85a8823ca

Change-Id: I70bba11c696ede1df27ca77400cdb8b6c25f450a