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

Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f