Fix app from v8 to v21 Android versions