Android gradle build

Added a stupid version of things.
Popup presenter calling dismiss

whatToShow got reset, but the Popup itself didn't know to reset its own state. Having the popup have to make a couplet of calls (dialog = null, onDismiss(whatever)) seemed super error prone.

dismiss() wasn't being called anyway.