Merge "Modified build file to copy the generated classes into the artifacts dir"