Merge "Move x86 constant area code to its own file"