Merge "Extract more reference inits." into dalvik-dev