Fix bug 1096554, make sure images from /common directory are copied.

Change-Id: I428d7a93f96a4c99d47a6fcd4fc0bd93d49e27ea