Fix NewApi Lint error (this time for real...).

Hi,
sorry for bringing this up again. I have noticed that despite Android Studio acknowledging the conditional statement as I changed it in the last commit, the Gradle build still fails with the Lint "NewAPI" error. Apparently, the conditional statement is not enough which is why I split the method in two separate methods and annotated the one for Froyo and above with @TargetAPI.

The solution is not elegant but Lint apparently forces us to do it like this...