Revert "otter-common: Fix OMX_COLOR_FORMATTYPE"

This reverts commit 53053529b8c1ba5ec1f5fbc34ec32f45415d9d8c.
Revert "Underped redeclaration"

This reverts commit 8d9679729b4b25b84a8c473a544762aeea892a5f.
otter-common: Fix OMX_COLOR_FORMATTYPE

This fix the build breakage introduced on http://review.cyanogenmod.org/#/c/43568/

Change-Id: I7b1e7bc70fad9087d17ab05144c732d04fbc1cb0