Merge "Revert recent JIT code cache changes"
am: 461ec567f1

Change-Id: I2811a099d019c174beee92b9e8d120fa39ceb5ef