Merge "Include AudioPolicyInterface.h only when needed."