Add options to repair or change file system

Change-Id: I9043e98e1e1ed4722f05c13a60b43d2d0bf739f6
Merge remote branch 'omni/android-4.4' into android-4.4