Remove unused CFLAGS

Change-Id: Ia3144ae9bc2b121a8fc3558711160cb6a2ac3a7c
Merge branch 'cm-11.0' into martincz