Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""