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

Change-Id: I46dd6f7a37d699c0e9af07dcad34bf5755b092af