am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master

* commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5':
  Stop using apache http to download Gps XTRA data.