Merge "Support custom my_copy_pairs in package-modules.mk"