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

Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d