Merge changes I545be996,I2bef893e,I8c026cd2

* changes:
  gn2bp: create single java library from all sources
  gn2bp: collect java sources
  gn2bp: be explicit about dropping java_group dependencies