Merge "Move sdk staging dir to a product-specific dir"