am 86cd8059: Merge change Ia7f1d23e into eclair

Merge commit '86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-mr2

* commit '86cd8059dec97e2c1f1797d1e179719561d05162':
  Update sdk build to use the new folders in sdk/