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

* commit '0a8ec948117c5b353a08f835f56dc9de93842dc6':