am 5191b0fe: am 2f930f38: Merge "Fix "error: \'strerror\' was not declared in this scope"."

* commit '5191b0fef7a7bd31c15973cdf9d707e403c6a862':
  Fix "error: 'strerror' was not declared in this scope".