Merge change Ia7f1d23e into eclair

* changes:
  Update sdk build to use the new folders in sdk/