Merge "Move MethodInfo to CodeInfo."
am: ee30c5997a

Change-Id: I92447186729bb41bc3dd48c49e8e6fc4e3ae59ad