Merge "Add a dalvik.vm.boot-image option for zygote and installd."