am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."

* commit '55dc8e65c24e3b0dd99049d9552b6f5c96ba5eea':
  Fix libportable build breakage.