am 7a17a9af: Merge "Fixed to #include correct 32-bit headers"

* commit '7a17a9aff795e9ae17de50b5001bef8412f3e300':
  Fixed to #include correct 32-bit headers