Do not restore file system on data/media devices

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