Merge "Bug fix in layoutlib"