Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev