Android m preview 1
am 2f930f38: Merge "Fix "error: \'strerror\' was not declared in this scope"."

* commit '2f930f38c019b95f4e92fdd148c0e2386f63ec29':
  Fix "error: 'strerror' was not declared in this scope".