Merge "Add CTS tests for NDK tracing" into mnc-dev