Merge "Clean up class reference initialization." into dalvik-dev