Support recoveries without CONFIG_EXT4_FS_XATTR

If for some reason the recovery's kernel can't be replaced and has
no support for xattrs, use this. Chances are the system will break
unless you know what you're doing and compensate on the Android side

Change-Id: I09ff2cbd0ae68ec4f4b2a2e26acb6b0bc8b3569a
Remove redundant variable definition

The same Volume variable is defined with two names in the same scope.
Merge the names and remove one of the definitions.

Change-Id: I021697b42791bc6323c5fa0d9704d27ecfe2c8c1
(cherry picked from commit d98fabe2aa8df0e421a69130c1d787705209682d)