Merge "Move InlineWithControlFlow to Smali based."