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

Change-Id: I87ed9b8606c4ab6fea430319c1531ace8b3d2478