Merge "Fix build product names and add new file paths"