Merge "Fix ccsdk/apps docker build"