Merge "Part 2. of porting remaining DAsm files to Smali in vm-tests-tfConvert" am: 303257f6ff am: 7e28b73922
am: e99031c865

Change-Id: I59a21d0dfb2d196c747166838c48c5c9cdf3b542