fixed merge errors in constant_pool_test.cc; commented some stuff out to make the project build.