rework build stuff for compatability with new android gradle build stuff