Merge "Use frame info from CodeInfo."
am: 6f39dab247

Change-Id: Ib6fd48d338d552365e82b238784e49290d202e26