Preparing for Android support

Cleaning up the render system in preparation for Android support.