Merge "NX test should not fail on ARMv5 hardware." into gingerbread