Merge branch 'master' into touch-examples

Copying of touch build was done inside copy_touch2_images, which
wasn't really the correct place.  Also, all the copy_*_images
methods were removed, so I created a separate copy_touch_build
method.