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

Change-Id: I56942e529a1242bc411547c0e9c76a3b508bdcee