Merge "Fix unintended change in JIT inlining heuristics." am: 89ae0f42e3
am: 62528575b4

Change-Id: Ia8d373c5ae6c9607c3841a2ba6cc45e473e2f06a