Merge "Move definition of build-userimage-ext-target to build/"