Update common.mk
Merge remote-tracking branch 'origin/gzroms' into 5.1
Update common.mk
Update common.mk
Revert "Revert "themes""

This reverts commit 61c6e051d2cd4de0708674dc535bf21d5e4e1a19.
merge 5.2
Merge remote-tracking branch 'origin/5.1' into gzroms