Bug 854389 - Add patches to emulator and otoro.