Merge "Add make common step before making subprojects"