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