Merge "remove (dead) caches from hwui"