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

Change-Id: I7dae8519843e007974d21025d72c49957caded83