Merge "build: Add extra build customization for /product" am: a80f1e3257
am: 64ea350dd8

* commit '64ea350dd8c2d2b1dc73f753c0bad8e98e12c511':
  build: Add extra build customization for /product