Enable CFLAGS to be configurable for build
Merge branch 'fix-build' into integration