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

Merge commit '7ae4c4026a3e0596d32983003594abb0d3df80cc'

* commit '7ae4c4026a3e0596d32983003594abb0d3df80cc':
  Make the SDK packaging put the samples in the root folder.