Merge "Clean up AudioRouting API internals." into nyc-dev