Merge "Audio policy: remove using namespace std in header"