Merge "Add support for dalvik.vm.extra-opts property."