Merge donut into master
[android/platform/external/xdelta3.git] /