Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev