am 491086e5: Merge "Changed path to the private dns headers Bug: 13219633"

* commit '491086e5f523b5ae86734e135dd8685499c954fa':
  Changed path to the private dns headers Bug: 13219633