Merge "fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&" am: 1206850289
am: 43f24ab1b2

Change-Id: I7e097b4a53d0897879af878624e1e89974d14282