Merge "Fix -Xjniopts:forcecopy, which I broke." into dalvik-dev