Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6 am: 0b1fc880e5
am: 99dc51da38

Change-Id: I711c56f11c785ff7d2ccadbf912d96b6854c94b7