Cleanup code around recording method trace events am: d265a80f86 am: 463ff4e09f

Original change: https://android-review.googlesource.com/c/platform/art/+/2411662

Change-Id: I45757b6a9f81bf3e34db1e48f3dc90bcdd2bd1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>