Merge "Remove vestigial remnants of GLES2_dbg"