Merge "add xapp base builder image"