Merge change 1904 into donut

* changes:
  Integrate unsubmitted cupcake change 123656:     CTS: add test cases for location.Criteria, Geocoder, GpsStatus,     GpsSatellite and Location
tree: 1fc2b01a883f84977d048608f6edd554fd709b69
  1. tests/
  2. tools/
  3. Android.mk