Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev