Merge "Fix build: Revert "Add CTS tests for NDK tracing"" into mnc-dev