Merge "Fix ArtChrootPreparer error reporting"