am 1a54368b: Merge "Add full support for Canvas.setDrawFilter()"

* commit '1a54368b24a8cb88ee56ee746eae45171a43b89e':
  Add full support for Canvas.setDrawFilter()