Remove duplicate implementation of drawEllipse and some related PLATFORM(IOS) ifdefs