Merge "mterp generation cleanup" into dalvik-dev