am ba6d9438: Merge "Fix core spill mask for x86 special suspend."

* commit 'ba6d943827e6df52316a843468691de264ab4aa5':
  Fix core spill mask for x86 special suspend.