am c135de36: am 9b8a514c: am e4f25559: am e306bf44: Merge "Add CTS tests for NDK tracing" into mnc-dev

* commit 'c135de366c897fd8cd5433a801700e14581848e4':
  Add CTS tests for NDK tracing