Merge "Add small thread-local cache for use by the interpreter."
am: 62741139ea

Change-Id: I6772050951cf866b970dadda3e2a842f56c78755