Merge "audioflinger: add watchdog on main mutex" into nyc-mr1-dev
am: 6da0f8d15b

Change-Id: Ibd61b7f2d93b1eeab020d5128193652ec58a0c62