Revert "update defconfig"

This reverts commit 40341695a62c76daea65466387a0f259590afd85.
Revert "block: support volname for HTC devices with proc/emmc support"

This reverts commit 2fb5f77b644400ec64b7cff3b9f7e9d64fa70bcf.