Merge "gn2bp: mark java targets as java_group"