Merge "Part 1. of porting remaining DAsm files to Smali in vm-tests-tfConvert" am: ba5c29a84b
am: 60745aacdf

Change-Id: I4449fbbf2d0afee111a0021948fa475d0c28b9f0