Merge "Revert recent JIT code cache changes" am: 461ec567f1 am: 2488744d60
am: 1f7b92d79b

Change-Id: Idd4ab6a92225c70de132db297c4e5df3f4f0a630