Merge "Fix a libartd.so boot crash in Heap::AllocObjectWithAllocator()" into dalvik-dev