Merge change 1355 into donut

* changes:
  GPS: Generalize SUPL support to include AGPS for CDMA