Merge "layoutlib relies on refSkPixelRef(), put it back"