Merge changes Iea1d2ae2,I1d3c8e48

* changes:
  Build java_sdk_libraries with much less sources
  Add RequiresApi annotations to LocationProvider