Fix up master issues with tracing/logging and the compatibility library.

Change-Id: Ia35ca58807a78ea01c4da6c44b4d5e29e65e0cfd
3 files changed