Merge "Remove ATRACE_TAG_APP from atrace's control" into pi-dev
am: a51ae04d6f

Change-Id: I5ee12ccf648f9ad3ba2c059b80828dda07d2ef9c