GL: Cleanup.
Android build fixes wip.