Merge change 4786 into donut

* changes:
  gps: Set SUPL server via hostname rather than IP address.