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

This reverts commit 7c7b8be70b70f07d611990db25da464f788553cd.