am 7e78cb83: am 0a8ec948: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit '7e78cb836c28adef4c9c2f1eada34d9b6c2894e9':
This commit is contained in: