Merge "Cleaup of rsComponent to remove GL types."