Merge "Improve error reporting in the layoutlib class replacement test."