[OS-BUILD PATCH 2/24] redhat: Combine Makefile and Makefile.common