Merge "Add full support for Canvas.setDrawFilter()"