Merge "Make layoutlib more lenient with recoverable errors" into oc-dev