Merge "Relocate the always in-lined functions from HeapBitmap.h." into dalvik-dev