am ac986b0d: am 6be8bb5f: am 86cd8059: Merge change Ia7f1d23e into eclair

Merge commit 'ac986b0d117a72482b8490a9c84b56d2c239da49'

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