[Build] Cleanup build and mapping.xml. Make sure we are not using generated files by a previous target