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

Android: Update to API 21
Merge pull request #1190 from ne0fhyk/fix_issue_1179

Fix issue 1179