Merge "Refactor HWUI to better handle Canvas DrawFilters."