Merge "Fix verifier upcasting type after instance_of." into dalvik-dev