Merge "Fix fill color alpha in layoutlib"