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

Change-Id: Ia3b60612cf0434d7607a72ff59f81de993e1ef7a