Merge "Move InlineWithControlFlow to Smali based."
am: 901679cbdf

Change-Id: If88d0f76e0d41bf13ebe0ea4c96cb3c7bfb8df45