Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa

* changes:
  Switch service-permissions to java_sdk_library
  Make module apis dist their output
  Include annotations in module metalava runs
  Dist module stub libraries for in sdk builds
  Use module_current to build module stubs