Fixed lint build errors for gradle build