Revert "[WIP]Improve dalvik based on CAF"

This reverts commit a837fb5ed0423e9e3ffd72893aef39c5f57c9407.