Merge "Allow the use of filenames when traking code paths for profiling"
am: fe427267d2

Change-Id: I29378228e62431a4454a40a1b880ad234a903d0d