A debuggable apk should not clobber a release apk

A couple small changes...