am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"

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