Merge "Make the copying collector build again." into dalvik-dev