Merge branch 'android-fix-c++_shared' into release-3.9