Merge "fs_mgr: support reading fstab based on ro.boot.hardware.platform" am: 3d879b10d8 am: 45aa5ed89a
am: 317ec5cf5b

Change-Id: I750a68f64cab44ac05922ca9b6c57ca59768c367