Merge "Systrace support for NNAPI" am: b05c8a4d80 am: 3faf94f388
am: 821261cd07

Change-Id: Ib38efcb8cc20f413db9988c53ca3c6267ab06c65