Merge "Add support for drawPoint() and drawPoints()."