Revert "Merge camcory settings_test"

This reverts commit 64e623a09aa8ec9964728ca4fdf93525e78f2543.

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml