Merge pull request #2627 from sigmabeta/android-non-games Android: Have non-games use their filename as a Game ID.
