[DEV_TOOLS] Tweaks to gradle build