interpreter and jit tests fail. Bug: 22858531 This reverts commit c033474c. Change-Id: Ic12a3e2a1908ac0db52d21a0b44b2508c88b2585