Merge "Allow using runtest with frameworks-services tests"