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

Change-Id: Ia1354774d6d849f320affe096d97f583bac47544