Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" am: f8e12c51d4 am: d9cb1b429a
am: 88a149e239

Change-Id: I974d505767daa96356edefd2659eefff705be553