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

* commit '726f6d87a59a8b56db08820e8204cd410ab0c0d4':
  Bugfix for libportable to make compile happy.