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

* commit '7314eb087f7318118fbf80827789a2626a8f66b5':
  Fix broken copy of kl/kcm/idc files to system image