Merge "Some more InitRefs-ing" into dalvik-dev