Merge "Use a UniquePtr to clean up global logging std::string*s." into dalvik-dev