Merge "Speed up MterpShouldSwitchInterpreters check"
am: f65aa50522

Change-Id: I82c91ae1960259efd3e576421f51c76542a2af8c