am 3ef36b21: Merge "Use system property to set dns cache size"

* commit '3ef36b2115d0802e668e325b59af6ef14d999e71':
  Use system property to set dns cache size