Merge "Split addNewHeap into separate definitions." into dalvik-dev