am f588772b: Merge changes I9347ab44,I3f080b34

* commit 'f588772b05c35f19e25404bedc7890289de7c4b9':
  use consistent guards for off_t and size_t defines for IA
  Simplify variable typing for IA builds