Merge "Don't build tests in normal builds"