Improve doxygen group definition generation

Change-Id: Ic88db7487863c141bbca05e2c2708eae018685e7