More cleanup.
Compatibility with higher API levels.
Merge branch 'master' of https://github.com/markuspalme/cropimage