Merge "Fix DeqpTestRunnerTest tests." into lmp-dev