Merge pull request #6051 from JosJuice/android-sys Android: Extract Sys to a different folder than the User folder