Lint fixes for new Jelly Bean tools