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