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

* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
diff --git a/core/Makefile b/core/Makefile
index 283dc1b..bd2f9a0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1458,7 +1458,7 @@
 # The SDK
 
 # The SDK includes host-specific components, so it belongs under HOST_OUT.
-sdk_dir := $(HOST_OUT)/sdk
+sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT)
 
 # Build a name that looks like:
 #