am 183b2ce3: am dede575e: Merge "Make libportable.a compile on host"

* commit '183b2ce3b14157c735f585b1b627d546a1f619fa':
  Make libportable.a compile on host