Android: Update to API 21
Merge pull request #1189 from DroidPlanner/maintenance

Android: Update to API 21