PAX ASLR: Remove macros introduced by a mismerge.