Merge "Remove Skia's src/image as a search path for HWUI"