Merge "Layoutlib: Fix alpha support in Canvas/Paint."