Upgrade to Android API 21

Just keeping up-to-date with Google's painful habit to update all the time and break everything without notice...