master
8244044: Refactor phase makefiles to be structured per module
8311247: Some cpp files are compiled with -std:c11 flag