Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am: 80e697a297

Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a