Merge "Revert "Add ninePatch support to Canvas.h""