Merge change I4d3d08a1 into eclair

* changes:
  Add the sdk overlay to the build.