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

Change-Id: If55a20564704769fc750fb6675533e9a0b8f3b6a