Change group and parent ids. Bump version.

Rationale: we don't want to cause conflicts between the upstream version
and GridLine-specific patches.

(The upstream only uses major/minor versions, so we can use the
incremental version numbers.)

Change-Id: I07a6fcb6e993a495bd8836e8683a9132e591917a