Merge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66
am: 86fbbfb6f0

Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853