Flavor decomposition of the polarized quark distributions in the nucleon from inclusive and semi-inclusive deep-inelastic scattering