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

Change-Id: I97e9920bfb5cf7f97a0efd5f0079fef9a50b67a3