Merge "leanback: switch to use standard TraceCompat"