Merge change 25286 into eclair

* changes:
  Fix sdk build.