Merge changes Id99f077f,I56efd6c6 into main

* changes:
  Remove PRODUCT_SDK_ADDON_COPY_FILES from build files
  Dedup variables in build files