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

Change-Id: I2d95a74165805a73e8882b465b50d13e3dd3319d