am 2a70aba8: am ab4fc823: Merge "Fix all resolv warnings and turn on -Werror."

* commit '2a70aba8460eff1bfb1417c271c6a5a53c560afa':
  Fix all resolv warnings and turn on -Werror.