Merge "Add -Xjniopts:forcecopy-unmap to catch more errors than forcecopy." into dalvik-dev