am bc6cb93b: Merge "Move x86 constant area code to its own file"

* commit 'bc6cb93b2607e584fccdfe4e05ae74aa94e9e463':
  Move x86 constant area code to its own file