Merge "Build com.android.location.provider with java_sdk_library"
am: aa5d8dfeb0

Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4