Merge "Fix GLESv2_enc subtraction not protected"