Merge "Fix "@null" resource values in LayoutLib." into lmp-dev