Merge "Support * as a wildcard for ATRACE_TAG_APP" am: 53c964f53b
am: 2e50045f60

Change-Id: I8b593eb2752483b825acfac55eba5013fd427f33