Fixed my derp

This reverts commit 8164a4f853eae7665bf05dfc5b220b73d8f80db8.
Revert "config: marvel: fix cmdline"

This reverts commit 52282944e2bf582a4dfd8cae7f610c97e52a7dc3. It's
useless.
Flashlight and proximity sensor updates from HTC