Merge "Clean up field offset initialization." into dalvik-dev