Merge "Prep DDMS stuff in InitRefs" into dalvik-dev