am f198b96d: Merge "Add native tracing API" into mnc-dev

* commit 'f198b96d4aee9cf73fd7db13bbcbfdfcabefb6e1':
  Add native tracing API