Merge "Revert "Load native GLES driver when specified."" into udc-qpr-dev