We have added and moved elements around and that needs to be reflected in tools/build-image.sh so that local image builds result in functional images. Change-Id: Iaba5eac8ff65b10d608c7d5aa84f083ee00a8319