am 17a0d191: am 01c0e19e: am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."

* commit '17a0d1915f871ad67608a582a4fb3352000cf719':
  Don't #define SYS_ constants unless they make sense for the current architecture.