Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65a am: c2b63921 am: d12b7f79 am: 9afc75d6 Change-Id: I749d8e74403a91794526a91c6b538e8ed49113f4