Revert "ASDK gov edits"

This reverts commit dda7fd217eb247aa01237d5bffe3af71c67b0ac8.
Happy now? -- Revert "GOV: ASDK"

This reverts commit 23653962f84306687676319cffad1c1bc8ebaa75.

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig