Merge change 8922

* changes:
  GPS: Don't call native_set_agps_server() until after we call native_init().