Merge "Revert "fs_mgr_overlayfs: Revert to use /data only if VAB""