am 90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT...
am 90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '90e99716':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.