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

Change-Id: Ie48e8bd7a4ebb461ee19f6efd61a95565fd0a01d