Merge "Layoutlib: Properly dispose of bitmap delegate."