Revert "Revert "Revert "Revert "Update common.mk""""

This reverts commit 60df309406e230c0b759bb40a809f8c0f449abe1.