Merge "Remove unused failing genrule"