Fix broken location extras in GpsLocationProvider.

Fixes http://code.google.com/p/android/issues/detail?id=4151


(Satellite count not being provided by Location class any more. Location.getExtras() returns null.)

Change-Id: I4cf2922f4a5ed216541f8a8553523d1f6a1c1d0c
Signed-off-by: Mike Lockwood <lockwood@android.com>