Fix warning about trailing comma in enum list.

Change-Id: I82f4b76f30f7b7b57c6050727a5927516791a2d4
Clang: commas at the end of enumerator list are a C++11 extension
[-Wc++11-extensions]
Merge topic 'enum-trailing-comma' into master

050c2df6 Fix warning about trailing comma in enum list.