(2/2) Make ROM compatible with ext4/f2fs

Conflicts:
	tools/releasetools/edify_generator.py

Change-Id: I9cd25089d7d326250def2725ec3ea3aa16c14c3c
forgot to resolve the conflicts..

Change-Id: Ib2befd1a5e4bc070866fd463f9ff66a5517a771f