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