Unify sysroot_target_{bin,lib}dir handling
#132723
Merged
sysroot_target_{bin,lib}dir handling
#132723