Merge "Tweak audio APIs for better forward/backward/sideways compatibility."