Remove mistaken typedef from 83a82981dc81. (This broke the Windows build at least.) Change-Id: I09f088258dc4949554b30c822f8c6cdfa7cd84ff