am 5b664707: Merge "Bugfix for libportable to make compile happy."

* commit '5b6647076bcc06ec43ea49ad7a472942226f35a3':
  Bugfix for libportable to make compile happy.