am c725b6ee: Merge change I4d3d08a1 into eclair

Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-plus-aosp

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.