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

Change-Id: I076c7a21cbb8fbd0722b1976d1d298a5376e23b4