Remove DOMX/Camera related changes

Change-Id: Ia6a99498aec2785f6e67610f5d1a498241727934