am bb08ff61: am 014f981b: am 726f6d87: am 5b664707: Merge "Bugfix for libportable to make compile happy."
* commit 'bb08ff6175a191503293a5796c71300f45bdf28c':
This commit is contained in: