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

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