am 5b8ff095: resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp

* commit '5b8ff09578e647db8575699cf46ab9f6f816f6f8':
  Consistently use strerror in libutils.