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

Change-Id: I71f449c2ae0a24a736f460cb64e501e09485bf30