drawingml customshape export: handle docx corner cases

Change-Id: I4b2b13c0855180acbfe34b594e12e493d4f04120