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

Change-Id: I577e296830b1928fa025cfca4d96a57f9b546a78