Add branch cm-11.0-caf

lot of clean up
fixes for build with gcc-4.7