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

Change-Id: Ic8dd5e33604d8d102cd47becfcd2abbb268ff80a