am aafbbe7e: Merge "Add a default value for ro.zygote."
am aafbbe7e: Merge "Add a default value for ro.zygote."

* commit 'aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
  Add a default value for ro.zygote.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build