Fixed compilation issues by bumping android version