audio: Update NS for functions from h/i/audio/aidl/common/include/Utils.h
These utility functions got moved into 'aidl' namespace,
update code that uses them.
Along the way reorganized lists of includes to match the
style guide.
Bug: 205884982
Test: m
Change-Id: I541e45b9cdb6c85711e53bd8c0cd10a60160bcc5
diff --git a/media/audioaidlconversion/AidlConversionNdk.cpp b/media/audioaidlconversion/AidlConversionNdk.cpp
index 413ae67..71c547c 100644
--- a/media/audioaidlconversion/AidlConversionNdk.cpp
+++ b/media/audioaidlconversion/AidlConversionNdk.cpp
@@ -72,7 +72,7 @@
std::vector<std::string> filterOutNonVendorTags(const std::vector<std::string>& tags) {
std::vector<std::string> result;
std::copy_if(tags.begin(), tags.end(), std::back_inserter(result),
- ::android::hardware::audio::common::maybeVendorExtension);
+ ::aidl::android::hardware::audio::common::maybeVendorExtension);
return result;
}