Merge "Move MethodInfo to CodeInfo." am: ee30c5997a
am: 6ed701fe72

Change-Id: I9175ab8f2b24ca36ca32e7c2aa715983e4cc7021