Merge "Revert "Add genrule for the current sdk proto""