Merge "Systrace support for NNAPI"

#define ATRACE_TAG_ADB              (1<<22)

#define ATRACE_TAG_VIBRATOR         (1<<23)

#define ATRACE_TAG_AIDL             (1<<24)

#define ATRACE_TAG_LAST             ATRACE_TAG_AIDL

#define ATRACE_TAG_NNAPI            (1<<25)

#define ATRACE_TAG_LAST             ATRACE_TAG_NNAPI

// Reserved for initialization.

#define ATRACE_TAG_NOT_READY        (1ULL<<63)