Merge "ART: Add method names to lock-contention samples" am: 4f101e5b6a am: 951eadf9d2
am: 4912bfd97c

Change-Id: I74ad6b2601a7b44885139de00d63165d1d6b597a