common: update for 4.7

Conflicts:
	common.mk