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

Change-Id: If214f52c141ef4d0f106bc3f5d2778f9b8f40b1e