Remove a duplicate, and make some drm props optionally excludable

Change-Id: If7a5a5ef46cf5ef5f8aac96d55e9b554dd1d2bfe