Updated for Android V22 dev tools