Merge change 25265 into eclair

* changes:
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.