Merge "Fix typo in build file"