Merge "Allow the use of filenames when traking code paths for profiling" am: fe427267 am: 4672c2a4 am: 4c4c2a42 Change-Id: Ie60ec12068caa4720b82597b96798f9776852fc7