Fixing up Android assets and AndroidPersistentSettingsModel