Fix compile error due to source directory reorganization.
Merge branch 'hotfix-cdt-optimize' into develop