pulling in latest changes to netflix gradle build template