am aeb41ec1: am b2061a30: Merge "resolv: make internal symbols static/hidden"

Merge commit 'aeb41ec103103c37bf4a1700de714d9ff1befe8e'

* commit 'aeb41ec103103c37bf4a1700de714d9ff1befe8e':
  resolv: make internal symbols static/hidden