master
8320915: Update copyright year in build files
8244044: Refactor phase makefiles to be structured per module