This patch adds modules for three files not covered, and adds a file to an existing module that is related.
Modularize catches this. I also forgot to mention that I only added some of the missing files in this patch, to get closer to Sony's version, to facilitate "cherry-picking", hence the "stage 1" in the title. The final (stage 2) will be to add the rest of the missing modules shortly thereafter.
Also, there probably should be a modularize test, but since modularize is in the clang-extra repository, I'll probably have to add the test to the modularize tests, in an other check-in.