DOCX import: handle groupshapes inside wpg elements (groupshapes)

Change-Id: Icb44f91219f75103f469f38f96d843b8e8251e92