Merge "Build overlaytests as part of the normal build"