Merge "Remove ATRACE_TAG_APP from atrace's control" am: fdc2d23054
am: ad838888c5

Change-Id: Ied32642e0e104ef363f550627480137f24e8a195