Merge "LayoutLib: Change nullity annotations." into mnc-dev