Merge "Factor out class names from throw statements." into dalvik-dev