Removed Android component for now, attempted to fix Canvas.