Merge "Fix bad generated path for generated sources"