Merge "Change log libraries in tests to be statically linked"