Add support for android lollipop (5.0) by falling back to the different libraries
Don't try and cleanup if we've never registered
Bump the version of the android maven plugin we use