Merge "Fix a moving gc bug in Instrumentation::ExceptionCaughtEvent." am: 7a9510d68a
am: 87f954cdc0

Change-Id: If2514ed78eb295364c8fdb922ea9a75c7789f800