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

* commit '881ec090c4790bdd588048f17038d167d7b52d87':
  build: Add support for defining products in /product