Stricter checking of Solver::Option::num_eliminate_blocks. Change-Id: Ic8e61cedbe0eb028a32c89f77dc6b838d3a8caa4