Merge change 6614 into donut

* changes:
  Fix issue 1970108: crash in AudioFlinger::isMusicActive()