Add CTS tests for NDK tracing

bug:21195272

Fixes makefile, which previously broke the build.

This reverts commit 6153cf3d6fe681506483d508a75ec13bafbc2e8b.

Change-Id: I4f995d0b6e981a520eb9e943e19cb6fa6d8e6c45
5 files changed