Merge "lessen fail criteria for openglperf" into jb-mr2-dev