Merge "build: Add support for defining products in /product" am: acb8a7c1f8 am: 881ec090c4
am: 555489aa84

* commit '555489aa84954ff9de6e661169c5c0fe95f62c40':
  build: Add support for defining products in /product