display-caf: clean and organize common.mk

This make file was all jumbled up with flags randomly being overwritten and cleared throughout it