Merge "Fix dEQP issues with identifier names with two underscores." into lmp-mr1-dev