Merge "These asserts are no longer pointless." into dalvik-dev