am 2bfaec8d: am c725b6ee: Merge change I4d3d08a1 into eclair

Merge commit '2bfaec8d3299031130330e4b6b32603df6900697' into eclair-mr2-plus-aosp

* commit '2bfaec8d3299031130330e4b6b32603df6900697':
  Add the sdk overlay to the build.