More gradle cleanup, upgrade flickrjandroid 2.1.0