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