Merge from trunk: fix for Android compilation of Boost.Filesystem (fixes #8706)