Merge "Revert "Work around deqp log file creation issues."" into mnc-dev