Move more oox/drawingml/ internal headers to oox/inc.

Change-Id: I0963c92356f8388ce02fb36e172ad3b2af8ba8f8
error: no matching function for call to 'assertEquals'

Change-Id: I0b87c2abeec30e9e4eab3ce488a5828b8a5b475d