Merge "Move MIDI utilities for internal use to com.android.internal.midi package"