Merge "Removed Duplicate Build Paths"