Merge pull request #161 from google/oops

Fix build error (sz/size).