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

* commit '7d1aa27155b6b6dbac9290d2c073b20be96f3fb4':
  Fix libportable build breakage.