am e3e421f8: Move sdk staging dir to a product-specific dir

* commit 'e3e421f85125c2c173bcafa07e901b6248e9530c':
  Move sdk staging dir to a product-specific dir