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

* commit '9b6e8af6994fd41f468161dec797354bb7778673':
  Use system property to set dns cache size