Merge "Change flush order in JIT code cache"
am: fce06454f1

Change-Id: Ia19d3aa9bab1df74ecdf34a3c2762e568c42f1b1