Merge changes I7a7e6759,Ifce10352

* changes:
  AudioFlinger: Util clang-tidy fixes
  AudioFlinger: Update utils for clang tidy