Fix more typos in solver.cc A number of typos in solver.cc which were hidden behind ifdefs and were only revealed when building under android. Change-Id: I89cbe8056da071479d2d1a251a8919b0be1f1cd4