Add zygote space to Dalvik Heap

Broken by
https://android-review.googlesource.com/#/c/115446/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

(cherry picked from commit 7fc9176c)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b