gradle: use different package name for debug builds

Change-Id: I3cbb7033414a5b6b5a64efb493c660a6fefecb0c
minor cleanups

Change-Id: I473edd67e02cd95922a82bf354017a4bb954eddc