Merge "Normalize the product makefile path in inherit-product."