Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev