Merge "device-common.mk: Avoid inherit-product-if-exists for inherit-product to avoid silent failures"
am: 420fd4b41c

Change-Id: I7b00781352790cd9e4c622b30a14f8a120f13e2d