Merge "Further init-time cleanup." into dalvik-dev