Merge "Move more types from android.media -> a.m.audio.common SAIDL"