Merge "Add support for CallKind::kCallOnMainAndSlowPath"
am: ac152079c6

Change-Id: I6581f3f4c9031ff06a5ebf2ae3ab97ffc2f4ea0b