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

Change-Id: I1068c67db02cde200c5e58feab2bae74db1bc1ba