am 6bf5bce6: am f588772b: Merge changes I9347ab44,I3f080b34

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