Merge "Add Test to Verify NX is Enabled" into gingerbread