am 6f5a5e31: am 5eb531be: am 392304ed: am 0f19d7f6: Merge "Fix build: Revert "Add CTS tests for NDK tracing"" into mnc-dev

* commit '6f5a5e3132a09b244239d9135ca82ee5de8d9269':
  Fix build: Revert "Add CTS tests for NDK tracing"