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

Change-Id: I4be1fc0a076c76c6de575fd3f832be87e9b273e3