Merge "Add mechanism for adding new files to ojluni/annotations."