Ported to android-21
Don't make parameters final
Merge pull request #6 from taky/master

Ported to android-21