Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev