Merge "set_mode and set_phone_state now take audio_mode_t"