Gadget-definitions: Make comment matching non-greedy

Change-Id: I1b92e4d84d11ff7493a2ec684815d19f0937caa7