Merge "Fixes for the location manager cts tests" into gingerbread