fix CMakeLists.txt to restore add_subdirectory(sample)
Merge remote-tracking branch 'origin/develop' into develop