Merge pull request #8582 from dclarke/v1-train

Bug: 841680  Remove Mochitest app from customizations(cherry picked from commit de3e5b9205e6cb1a6bd0858a98d159272ad96d11)

Conflicts:
	test_external_apps/mochitest/metadata.json