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

Change-Id: I8efd35438c50f29cff1420b1963ba641a7fcead9