Merge "Add a tool to generate manifest files"