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

Change-Id: I3655ad7a81e308de65e8899999da5fbc5b8c6f6c