(cherry picked from commit d84324ff)

Conflicts:
	odk/pack/copying/makefile.mk

Change-Id: I04c004b1ea2c6c05a18f48db553141e2cf32f06d