Merge change 8387

* changes:
  Fix issue 1999585: audioflinger crash.