Revert "Revert "Update common.mk""

This reverts commit 04ea406ce80fce9cc7dd1ace05a04e990f579d7a.