Merge "Support custom my_copy_pairs in package-modules.mk"
am: 5b91bd4ccb

Change-Id: I87afb199ec7504ca0c927332a641f93587a8480e