nandroid: Fix nonexistent backup format type bug.

Change-Id: I008d18e613e6a34099dc577d0452790f29a67169
nandroid: Fix nonexistent backup format type bug.

Change-Id: Ia5d6832137700b542c88b3c8d14efdd470bd195d
6.0.2.6

Change-Id: I001ac826f698bf509b423a6455694b1f705226e0
Do not attempt to back up .android_secure if it is on /data/media

Change-Id: Id252dd3fdd528ff2b87816a0f1947f2a54d5200a
Merge remote branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	nandroid.c