Get to the point of being able to do native drawing.

A little cleanup.

Change-Id: I37ef0557abf330d91d6fe47e81d062206b3bc346
4 files changed