am 2a0e18e2: Adopt the new error handling mechanism in portability.

* commit '2a0e18e280dfe541d4740345511ad299099cda79':
  Adopt the new error handling mechanism in portability.