Merge "Describe dalvik.vm.extra-opts." into dalvik-dev