am 437d6982: resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp

* commit '437d698257ab407790fed3e293fe6488fd0c5a70':
  Turn on warnings for libcutils, fix a bug.