Merge "Update entrypoint directly when doing JIT code cache GC."
am: da3355a9af

Change-Id: Ie7a3ffb16f1353f07ad8e6fb62663452e04c21c7