Use 'inherit-product' instead of 'inherit-product-if-exists'
so that the build fails if those files do not exist

Change-Id: I3881b5a3935b258ee0844e55f8d1cd29078ac908
Merge remote-tracking branch 'cm/cm-12.0' into HEAD