am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"

* commit '3157096157778278a34dd5d03cff24023d69251e':
  Enable NX protections