am 36c7f4b6: Merge "Add zygote space to Dalvik Heap"

* commit '36c7f4b67326bad547f16aa6e72140bd839ab28d':
  Add zygote space to Dalvik Heap