Merge "Cleanup references to system/core/liblog -> system/logging/liblog"