Merge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5 am: de301d6bbb
am: d7c33dd402  -s ours

Change-Id: I96f98f96ecc73492fa3ec5fb205a991351d621a3