Merge "Move code around to fix --inline-max-code-units in JIT."
am: dd7f2a2436

Change-Id: I7aaf9d19fa2bfd8c08d13060d46a3d77b9e47744