Merge "Fix layoutlib to reflect recent changes in platform code"