Merge "Turn droiddoc's metalava_merge_annotations_dir into a list."
am: 8c8fb65ad3

Change-Id: I33e614584ec7b445b35872d0b84d5224c6f7c4af