Merge pull request #2601 from Sonicadvance1/android_fix_user_directory [Android] Make sure we are setting the default user directory.
