am 2f2fb96b: Make the SDK packaging put the samples in the root folder.

Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp

* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
  Make the SDK packaging put the samples in the root folder.