Merge "LayoutLib: properly handle @null references in more places."