Revert "Cover more cases in nterp."

This reverts commit eb1fece2e49980f91bd31b5a8ef7f78c5f410c50.

Bug: 112676029
Bug: 157658616

Reason for revert: b/157658616

Change-Id: Ic4dd6b1aa7c30c99d8bc2eb0c9f6ee5e3dc471ee
4 files changed