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

Change-Id: I7304982e85df2b686ba68aff13cdc7b201dc766d