Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe am: 3482ea54a2
am: 4f5e8cc3ca

* commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582':
  Normalize the product makefile path in inherit-product.