[tor-commits] [manual/develop] Merge branch 'android-docs-rewording'