Merge changes from topics "soong_logtags", "droiddoc_srcjars"

* changes:
  Allow converting logtags to java without merged logtags file
  Add support for srcjars to droiddoc