Merge "Update HWUI to store its own SkBitmap objects"