Merge "fs_mgr_avb_ops: stores the by-name prefix of /misc instead of fstab struct" am: 5c4af9698c
am: 474897035d

Change-Id: I3f26e5adc173cfd448bb300c39f5320b967712ae