Merge "AudioPolicy API fixes"