Merge "MethodHandleInfo: Fix a couple of TODOs." am: 48b5f45068 am: a4673e6ef8 am: d5f1f63b7f
am: d332e3b8c3

Change-Id: I032230b8abb1d933510e39fb7dd78a3ce1b86b6b