Remove option count from sample configuration

This doesn't serve much purpose, and makes it much harder than it
should be to merge multiple patches that change the sample config.

Change-Id: I44895bfbf4a7c9af30040f84b17a97f8e2f4e5b6
Merge "Remove option count from sample configuration"