Merge "Removing GL calls from librs"