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

Change-Id: Ic991761c5359b33ae6a5fda1204f8ca89e0c5503