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

* commit '91e2c5dcde466a1f147220b3c753862b77a5da9e':
  Fix libportable build breakage.