Merge "Fix b/160761473 - Broken test: android.nativemidi.cts.NativeMidiEchoTest..."