fix boot when using ART.

Conflicts:
	runtime/gc/heap.cc
	runtime/gc/heap.h
	runtime/native/dalvik_system_VMRuntime.cc

Change-Id: I2cbad037f78e9c3f3516dded8d91df50187a9e67