Merge "Build com.android.location.provider with java_sdk_library"