Merge "Revert^2 "Update sdk parent"" am: 10a2f468 am: 83b16cee am: b8b537fc am: 44efe5cb

Original change: https://android-review.googlesource.com/c/device/sample/+/2101192



Change-Id: I72ca517461fc76a1af0380c281a4929ab110bc8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

products/sample_addon.mk

@@ -32,8 +32,8 @@ PRODUCT_SDK_ADDON_STUB_DEFS := $(LOCAL_PATH)/addon_stub_defs
 # in the documentation section.
 PRODUCT_SDK_ADDON_DOC_MODULES := platform_library
 
-# This add-on extends the default sdk product.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)
+# This add-on extends the arm emulator/sdk product.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_armv7.mk)
 
 # Real name of the add-on. This is the name used to build the add-on.
 # Use 'lunch <PRODUCT_NAME>-userdebug; m sdk_addon' to build the add-on.