Revert "Revert "Update common.mk""

This reverts commit 47647f185322138ee7d763600597a2a85f8c823e.