Track from CM/EV upstream for frameworks_native/audio-caf respectively