Merge "MethodHandles: Remove obsolete TODO."
am: c3410ca114

Change-Id: Id218afd7a264896945f7641b3334e932a844911c