Merge changes I86b19e65,Ie4161bb9,I6e61ba1c into main

* changes:
  [media]: Address post-refactoring comments
  [media]: refactoring AudioSystem.cpp to C++ style, part 2
  [media]: refactoring AudioSystem.cpp to C++ style