am 28464c41: Merge "Fix class redeclared as struct."

* commit '28464c41b111b13df3f8040959f5d45a4653d2ca':
  Fix class redeclared as struct.