Merge "resourceloader: Fix duplicate semi-colon in generated startup code"