Merge pull request #10445 from JosJuice/android-riivolution-path Android: Fix the logic for getting the Riivolution path
