aligned .mk and .gyp files; minor change in util_test