Merge "Fix Skia filter behavior test" into nyc-dev am: 0c5bd7dffe
am: de6400a282

* commit 'de6400a2824b4396e971fc5105f6dc29b97cebc7':
  Fix Skia filter behavior test

Change-Id: Ia19db77125a90b546e9766e070917f562c08d49e